From c82f2169e5963b63659f1b3fbf3a559dfcbb3baf Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Thu, 13 Mar 2014 01:43:27 +0100 Subject: [PATCH] treeview: Split out a function This is in preparation for the next patch. --- gtk/gtktreeview.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c index e4e127fc2e..2776ceab2d 100644 --- a/gtk/gtktreeview.c +++ b/gtk/gtktreeview.c @@ -5769,6 +5769,15 @@ gtk_tree_view_get_drop_column (GtkTreeView *tree_view, return (GtkTreeViewColumn *)0x1; } +static gboolean +gtk_tree_view_search_key_cancels_search (guint keyval) +{ + return keyval == GDK_KEY_Escape + || keyval == GDK_KEY_Tab + || keyval == GDK_KEY_KP_Tab + || keyval == GDK_KEY_ISO_Left_Tab; +} + static gboolean gtk_tree_view_key_press (GtkWidget *widget, GdkEventKey *event) @@ -15200,10 +15209,7 @@ gtk_tree_view_search_key_press_event (GtkWidget *widget, /* close window and cancel the search */ if (!tree_view->priv->search_custom_entry_set - && (event->keyval == GDK_KEY_Escape || - event->keyval == GDK_KEY_Tab || - event->keyval == GDK_KEY_KP_Tab || - event->keyval == GDK_KEY_ISO_Left_Tab)) + && gtk_tree_view_search_key_cancels_search (event->keyval)) { gtk_tree_view_search_dialog_hide (widget, tree_view, gdk_event_get_device ((GdkEvent *) event)); -- 2.30.2